merge trunk
authorKenichi Handa <handa@gnu.org>
Sun, 23 Sep 2012 07:41:08 +0000 (16:41 +0900)
committerKenichi Handa <handa@gnu.org>
Sun, 23 Sep 2012 07:41:08 +0000 (16:41 +0900)

Trivial merge